GdkWindow: Default to unfocused

Don't set the have_focused field of the window's toplevel to TRUE by
default and don't set the FOCUSED state in gdk_window_map. This a means
toplevel window's state is what the WM expects, and the FOCUSED state
will be set anyway when we map the window and receive a _NET_WM_STATE
message.

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index cbfbc02c7f67759701a022ffbf5eaaab94667d9a..04f488d2cf098fe35080f36025d1c46129d3a51a 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -3585,9 +3585,9 @@ gdk_window_show_internal (GdkWindow *window, gboolean raise)
   if (gdk_window_has_impl (window))
     {
       if (!was_mapped)
-       gdk_synthesize_window_state (window,
-                                    GDK_WINDOW_STATE_WITHDRAWN,
-                                    GDK_WINDOW_STATE_FOCUSED);
+        gdk_synthesize_window_state (window,
+                                     GDK_WINDOW_STATE_WITHDRAWN,
+                                     0);
     }
   else
     {

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 2bf01f7ee6bd2e088e40b74c737f998b8cd3a6de..e76f3b5413c63018893862121733868ba814c570 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -173,7 +173,7 @@ _gdk_x11_window_get_toplevel (GdkWindow *window)
   if (!impl->toplevel)
     {
       impl->toplevel = g_new0 (GdkToplevelX11, 1);
-      impl->toplevel->have_focused = TRUE;
+      impl->toplevel->have_focused = FALSE;
     }
 
   return impl->toplevel;